Steve fixes my fix (blush) in track filter.

diff --git a/gpsbabel/reference/track/seg2trk_test-seg.gpx b/gpsbabel/reference/track/seg2trk_test-seg.gpx
new file mode 100644 (file)
index 0000000..c381224
--- /dev/null
+++ b/gpsbabel/reference/track/seg2trk_test-seg.gpx
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx
+  version="1.0"
+  creator="GPSBabel - http://www.gpsbabel.org"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://www.topografix.com/GPX/1/0"
+  xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
+<time>1970-01-01T00:00:00Z</time>
+<bounds minlat="47.421095000" minlon="19.220695000" maxlat="47.421186000" maxlon="19.220939000"/>
+<trk>
+<trkseg>
+<trkpt lat="47.421186000" lon="19.220939000">
+  <ele>152.000000</ele>
+  <time>2012-11-05T07:16:29Z</time>
+  <course>0.000000</course>
+  <speed>0.000000</speed>
+  <hdop>2.000000</hdop>
+</trkpt>
+</trkseg>
+</trk>
+<trk>
+<trkseg>
+<trkpt lat="47.421095000" lon="19.220695000">
+  <ele>138.300000</ele>
+  <time>2012-11-05T07:17:37Z</time>
+  <course>0.000000</course>
+  <speed>0.305556</speed>
+  <hdop>3.000000</hdop>
+</trkpt>
+</trkseg>
+</trk>
+<trk>
+  <name>Name Track</name>
+<trkseg>
+<trkpt lat="47.421186000" lon="19.220939000">
+  <ele>152.000000</ele>
+  <time>2012-11-05T07:16:29Z</time>
+  <course>0.000000</course>
+  <speed>0.000000</speed>
+  <hdop>2.000000</hdop>
+</trkpt>
+</trkseg>
+</trk>
+<trk>
+  <name>Name Track #2</name>
+<trkseg>
+<trkpt lat="47.421095000" lon="19.220695000">
+  <ele>138.300000</ele>
+  <time>2012-11-05T07:17:37Z</time>
+  <course>0.000000</course>
+  <speed>0.305556</speed>
+  <hdop>3.000000</hdop>
+</trkpt>
+</trkseg>
+</trk>
+</gpx>

diff --git a/gpsbabel/reference/track/seg2trk_test.gpx b/gpsbabel/reference/track/seg2trk_test.gpx
new file mode 100644 (file)
index 0000000..8ce0d0d
--- /dev/null
+++ b/gpsbabel/reference/track/seg2trk_test.gpx
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx
+  version="1.0"
+  creator="GPSBabel - http://www.gpsbabel.org"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://www.topografix.com/GPX/1/0"
+  xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
+<time>2012-12-03T07:53:56Z</time>
+<bounds minlat="46.943588000" minlon="14.156368000" maxlat="50.699530000" maxlon="19.226404000"/>
+<trk>
+<trkseg>
+<trkpt lat="47.421186000" lon="19.220939000">
+  <ele>152.000000</ele>
+  <time>2012-11-05T07:16:29Z</time>
+  <course>0.000000</course>
+  <speed>0.000000</speed>
+  <hdop>2.000000</hdop>
+</trkpt>
+</trkseg>
+<trkseg>
+<trkpt lat="47.421095000" lon="19.220695000">
+  <ele>138.300000</ele>
+  <time>2012-11-05T07:17:37Z</time>
+  <course>0.000000</course>
+  <speed>0.305556</speed>
+  <hdop>3.000000</hdop>
+</trkpt>
+</trkseg>
+</trk>
+<trk>
+  <name>Name Track</name>
+<trkseg>
+<trkpt lat="47.421186000" lon="19.220939000">
+  <ele>152.000000</ele>
+  <time>2012-11-05T07:16:29Z</time>
+  <course>0.000000</course>
+  <speed>0.000000</speed>
+  <hdop>2.000000</hdop>
+</trkpt>
+</trkseg>
+<trkseg>
+<trkpt lat="47.421095000" lon="19.220695000">
+  <ele>138.300000</ele>
+  <time>2012-11-05T07:17:37Z</time>
+  <course>0.000000</course>
+  <speed>0.305556</speed>
+  <hdop>3.000000</hdop>
+</trkpt>
+</trkseg>
+</trk>
+</gpx>

diff --git a/gpsbabel/testo.d/track.test b/gpsbabel/testo.d/track.test
index 379cf4b8f88c50c90fb5c0587286adccb416361d..36f10c3c42eba3aafaea870322eca1569dab416e 100644 (file)
--- a/gpsbabel/testo.d/track.test
+++ b/gpsbabel/testo.d/track.test
@@ -23,3 +23,7 @@ compare ${REFERENCE}/track/trackfilter_faketime_forced.gpx ${TMPDIR}/ftf.gpx
 # reverse the track
 gpsbabel -t -i gpx -f ${REFERENCE}/track/trk_reverse_test-fwd.gpx -x reverse -o gpx -F ${TMPDIR}/trk_reverse_test-rev.gpx
 compare ${REFERENCE}/track/trk_reverse_test-rev.gpx ${TMPDIR}/trk_reverse_test-rev.gpx
+
+# seg2trk filter test
+gpsbabel -i gpx -f ${REFERENCE}/track/seg2trk_test.gpx -x track,seg2trk -o gpx -F ${TMPDIR}/seg2trk_test-seg.gpx
+compare ${REFERENCE}/track/seg2trk_test-seg.gpx ${TMPDIR}/seg2trk_test-seg.gpx

diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.c
index 9faa32813738b97b3dc0771d1b6d97303634a06c..b01a36cfa92ea03d95ba824e450bf68ba6bf685b 100644 (file)
--- a/gpsbabel/trackfilter.c
+++ b/gpsbabel/trackfilter.c
@@ -938,13 +938,12 @@ trackfilter_seg2trk(void)
     QUEUE_FOR_EACH((queue *)&src->waypoint_list, elem, tmp) {
       waypoint *wpt = (waypoint *)elem;
       if (wpt->wpt_flags.new_trkseg && !first) {
-        char trk_seg_num_buf[10];
 
         dest = route_head_alloc();
         dest->rte_num = src->rte_num;
         /* name in the form TRACKNAME #n */
         if (src->rte_name) {
-          xasprintf(&dest->rte_name, "%s #%s", src->rte_name, ++trk_seg_num);
+          xasprintf(&dest->rte_name, "%s #%d", src->rte_name, ++trk_seg_num);
         }
 
         /* Insert after original track or after last newly